From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Tue, 27 May 2014 19:10:28 +0000 (-0400)
Subject: screenshot: Don't use meta_window_get_rect
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~2459
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=516b8f6bf8d9e74b63c664a4fc239210bb3079b3;p=gnome-shell.git

screenshot: Don't use meta_window_get_rect

It's going to be removed soon.
---

diff --git a/src/shell-screenshot.c b/src/shell-screenshot.c
index a076aaabc..02d4e1503 100644
--- a/src/shell-screenshot.c
+++ b/src/shell-screenshot.c
@@ -530,26 +530,15 @@ shell_screenshot_screenshot_window (ShellScreenshot *screenshot,
   window_actor = CLUTTER_ACTOR (meta_window_get_compositor_private (window));
   clutter_actor_get_position (window_actor, &actor_x, &actor_y);
 
-  if (include_frame || !meta_window_get_frame (window))
-    {
-      meta_window_get_outer_rect (window, &rect);
+  meta_window_get_frame_rect (window, &rect);
 
-      screenshot_data->screenshot_area.x = rect.x;
-      screenshot_data->screenshot_area.y = rect.y;
+  if (!include_frame)
+    meta_window_frame_rect_to_client_rect (window, &rect, &rect);
 
-      clip.x = rect.x - (gint) actor_x;
-      clip.y = rect.y - (gint) actor_y;
-    }
-  else
-    {
-      rect = *meta_window_get_rect (window);
-
-      screenshot_data->screenshot_area.x = (gint) actor_x + rect.x;
-      screenshot_data->screenshot_area.y = (gint) actor_y + rect.y;
-
-      clip.x = rect.x;
-      clip.y = rect.y;
-    }
+  screenshot_data->screenshot_area.x = rect.x;
+  screenshot_data->screenshot_area.y = rect.y;
+  clip.x = rect.x - (gint) actor_x;
+  clip.y = rect.y - (gint) actor_y;
 
   clip.width = screenshot_data->screenshot_area.width = rect.width;
   clip.height = screenshot_data->screenshot_area.height = rect.height;